# HG changeset patch # User Michiel Broek # Date 1701890760 -3600 # Node ID 2d328a2a40253431a8769fa1f37a59dd26acb625 # Parent 548e5e9af0c6d86e01cb3143123a32df01e15781 Fixed init scripts names in Makefile. Update crontasks to use the database to check the log entries for products. diff -r 548e5e9af0c6 -r 2d328a2a4025 tools/Makefile --- a/tools/Makefile Wed Oct 18 13:03:10 2023 +0200 +++ b/tools/Makefile Wed Dec 06 20:26:00 2023 +0100 @@ -2,7 +2,7 @@ include ../Makefile.global -OTHER = Makefile bmsd.init +OTHER = Makefile init.slackware init.debian ############################################################################# diff -r 548e5e9af0c6 -r 2d328a2a4025 www/crontasks.php --- a/www/crontasks.php Wed Oct 18 13:03:10 2023 +0200 +++ b/www/crontasks.php Wed Dec 06 20:26:00 2023 +0100 @@ -79,34 +79,37 @@ $query = "SELECT record,code,name,log_brew,log_fermentation,log_ispindel,log_co2pressure FROM products;"; $result = mysqli_query($connect, $query); while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) { - $logfile = "log/fermentation/" . $row['code'] . " " . $row['name'] . ".log"; - if (file_exists($logfile)) + $query1 = "SELECT code FROM log_fermenter WHERE code='" . $row['code'] . "';"; + $result1 = mysqli_query($connect, $query1); + if (mysqli_num_rows($result1) > 0) $ok = 1; else $ok = 0; if ($ok != $row['log_fermentation']) { $query = "UPDATE products SET log_fermentation='" . $ok . "' WHERE record='" . $row['record'] . "';"; - syslog(LOG_NOTICE, $query); + syslog(LOG_NOTICE, $row['code'] . ": " . $query); $result1 = mysqli_query($connect, $query); } - $logfile = "log/ispindel/" . $row['code'] . " " . $row['name'] . ".log"; - if (file_exists($logfile)) + $query1 = "SELECT code FROM log_ispindel WHERE code='" . $row['code'] . "';"; + $result1 = mysqli_query($connect, $query1); + if (mysqli_num_rows($result1) > 0) $ok = 1; else $ok = 0; if ($ok != $row['log_ispindel']) { $query = "UPDATE products SET log_ispindel='" . $ok . "' WHERE record='" . $row['record'] . "';"; - syslog(LOG_NOTICE, $query); + syslog(LOG_NOTICE, $row['code'] . ": " . $query); $result1 = mysqli_query($connect, $query); - } - $logfile = "log/co2pressure/" . $row['code'] . " " . $row['name'] . ".log"; - if (file_exists($logfile)) + } + $query1 = "SELECT code FROM log_co2pressure WHERE code='" . $row['code'] . "';"; + $result1 = mysqli_query($connect, $query1); + if (mysqli_num_rows($result1) > 0) $ok = 1; else $ok = 0; if ($ok != $row['log_co2pressure']) { $query = "UPDATE products SET log_co2pressure='" . $ok . "' WHERE record='" . $row['record'] . "';"; - syslog(LOG_NOTICE, $query); + syslog(LOG_NOTICE, $row['code'] . ": " . $query); $result1 = mysqli_query($connect, $query); } }